From: Glenn Morris Date: Wed, 23 Nov 2011 07:09:27 +0000 (-0800) Subject: * src/font.c (font_find_for_lface) [HAVE_NS]: Ignore case. X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~1562 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=88da12cb90c9f527d710f5ae2963eb82580cf70c;p=emacs.git * src/font.c (font_find_for_lface) [HAVE_NS]: Ignore case. --- diff --git a/src/ChangeLog b/src/ChangeLog index d492f01dc5d..e4cd2964ed7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2011-11-23 Glenn Morris + + * font.c (font_find_for_lface) [HAVE_NS]: Ignore case. (Bug#2526) + 2011-11-23 Chong Yidong * xdisp.c (compute_stop_pos): Check validity of end_charpos before diff --git a/src/font.c b/src/font.c index 9559c65e7ed..35f5703e32e 100644 --- a/src/font.c +++ b/src/font.c @@ -3160,14 +3160,7 @@ font_find_for_lface (FRAME_PTR f, Lisp_Object *attrs, Lisp_Object spec, int c) else { Lisp_Object alters - = Fassoc_string (val, Vface_alternative_font_family_alist, - /* Font family names are case-sensitive under NS. */ -#ifndef HAVE_NS - Qt -#else - Qnil -#endif - ); + = Fassoc_string (val, Vface_alternative_font_family_alist, Qt); if (! NILP (alters)) {